Minor improvements to subtest code