improve unittests
improve unittests