cleaned up some test cases