All unit tests working again!