Added back some test cases