Refactored Testing classes, doubled coverage, refactored