Should fix unit test