Model tests

I had a couple tests lying around, which I'd put off trying to merge, since @henn was in the middle of rearranging the testing infrastructure. Now that that's complete, we should pull this stuff in as well.