updated tests to new models