changed tests so they will work with new models