Replacing scoped with where(nil) due to Active Record updates.  Six tests fixed.