Tests for the changes, tweaked as necessary