Add back some of the test cases