enabled more unit test cases