fix unit tests
fix unit tests