addapt the tests to the new model