ADDED better support for tests with the same names