Change TDD example to use existing task
WIP Replace most examples