fixed tests to meet new validations