renamed and modified tests
Merge branch 'model_controller_coordination' of https://github.com/pse3/SGfM into model_controller_coordination