Fix tests from prev commit