Fix up all the unit tests