This unit test still needs to get updated -- it's failing now that Ian's fix is in.