More test fixes for is local...