Sync model tests with newer models

This branch makes the model tests reflect changes to the actual models.

tests.py passes with these changes.
Related to: #41