Fix up tests re: recent change