Cleaned up test cases a little bit