Simplify Activity codes
Simplified validation test