Refactored Testing