Remove validate sub-tasks
Merge branch 'issue/106-olympus' into develop-ascraeus

* issue/106-olympus:
  Remove validate sub-tasks
  Split preparing and testing into different tasks