Fix name collisions on some unit tests