Fixed up original test cases