Add real model instances
fix tests