Make try to fix unit test