This breaks the syndic, but fixes the tests

This also adds the code needed to get the syndic going again.