Bug 9142 - Remove the use of subtests