get all unit tests working again