Fixed issues with tests that were not run before #124
Changed naming of models in the imports #124