Cleaned up test class
Filled in a few test cases, cleaned up test class some more