fixed up some test cases