Validation done - tests working again