More test performance fixes