TMSS-917: adapted and fixed various tests now that we reverted to a single parent TaskBlueprint for a Subtask.