- Refactored concrete class names and associated tests