Test: Uses the non-recursive reference to the current test

@JamesMGreene, please review (also the commit msg)