Cleaned up the test, removed duplication
Renamed the class to something more readable