Adapt tests to new exec labelling design.