refactored test class for legibility