Fix tests (failing on master)