fixing unit test issues