Test refactoring
Test classes
More code coverage!