Whole slew of fixes to get the test output to build