refactored test classes for legibility