Fixing validation errors #3 and testing