Changed tests to work with new models