Fixed some unit test cases