refactored test classes