Very first steps start of fixing the tests for the handoff-pipeline redesign.