Changes to get the task example working, driven by Python system tests