adjust tests for new models