Change models and fix tests (it doesn't mean that anything works yet)