refactored Testing class