Multiple independent suites in unrelated source files now work properly