more unit test fix