Fix some namespace collisions in tests