Resolved unit test issues