Ooops!  Fixed test cases to account for the last commit.