Adds models for several more things. Adds one unit test.