Fix tests, remove httpsify references