unit tests fixes

Still need to address the syndic unit test so you can hold on on merging this. I'll report when complete.