Fixed a quartuple of broken unit tests