Make task tests pass