Fixed a number of unit test compile errors