Fix tests in light of 6ff1f53