Tweak tests so that they don't attempt to stomp each others settings