Fixing broken tests by reloading models and fixing relationships