Remove an extra intermediate name in a few tests