More test localization fixes