Fix an issue where not all tests from the suite were being run due to naming conflicts.