Fix tests after 6e1cea39b55cc018d6d137c6c198a3c20d933a19