Adjusted tests to using unique names