Add some basic test. Start refactoring models.