Tidy NonBasicTaskExecutionTest

- removes NonBasicTask (which was a copy of BasicTask)
- adds ForwardingTask