More unit test breakage.