Bundle up some changes

This fixed a few tests I am sure. (1 at least)