Fix some test breakages