This handles subtests correctly, and removes the need to specify when to export due to collisions with the old function.