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