continue refactoring project model
fix tests