fix unit tests;
move more tests to it