Remove step. Rename suite, test => subtest.