Converted to use subtests rather than just diag the sub-test results