improve unittests