fixing unit test issues 2