Fixed unit test cases