Refactored classes to match downloaded tests