Finish xor tests
Tweaks to clause generation