Reworking tests to pass with validations