fixed tests with new validations