Fix up some test cases