Cleaned-up model tests

In my rush to get this project submitted, I broke some
previously-passing tests.