Got all the unit tests working again.