More replacing, and two more test methods