Sorted out importing of models, views and tests