Enhancement test validation

Add tests for all validation functionality

100% Test Coverage :smiling_imp: