Various fixes

For tests, models and also the manager.