Working on better support for multiple test suites