Fixes the tests.
Full, but shitty coverage for models