Fixes to avoid static settings leaking across tests and causing them to fail