Set up app for tests
Updated models