Model wrapper tests

I changed tests to work with the new model formatting.