Note that these fixes were necessary to get the mis-named test working.