and bit more fixing to unit test