Fixed an issue which caused tests not to run.
Merge branch 'feature/bandedo/project-fix' into develop
Merge branch 'develop'