try to fix unit tests