Add more tests. Rename model class. Move config from test to test config