fix unit tests;