Got all unit tests working again.