Attempt to fix the tests by using a less broad fix for the unique names problem.