Fix tests on master