More test fixes and removing some account-restriction code from eloquent models (wrong place)