Adjust tests for new hierarchic task naming convention