Fix to unit test