Fix old specs using constant Client.