Split preparing and testing into different tasks

Fix #106
Merge branch 'issue/106-olympus' into develop-ascraeus

* issue/106-olympus:
  Split preparing and testing into different tasks
Merge pull request #115 from nickvergessen/issue/106

Split preparing and testing into different tasks

* nickvergessen/issue/106:
  Split preparing and testing into different tasks
Merge pull request #116 from nickvergessen/issue/106-ascraeus

Issue/106 ascraeus

* nickvergessen/issue/106-ascraeus:
  Split preparing and testing into different tasks
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus: