Correct finding of related actions in WT/RS. Fix up tests