fixes for unit test cases