Fix some of the unit tests