second part to fix unit tests.