given validation
tests fixed