Majority of the unit test suite working again