Just spent a couple hours fixing unit tests.