Corrected test name
Refactored and added further validation classes