Get the unit tests running again. This fixes everything except two lingering errors - I want to see if they occur on other machines.