fix tests to reflect new models