further unit test fixing