Refactored tests to build on a valid_data set passing validations