Fix Validation Tests