Cleaned up some test cases