Models fixes.
Fix all the tests.
Base structure for tests.