Passing Tests

Updating models so tests pass and things are usable yay! So far all student tests pass