fix some validation errors
fix tests