Add tests for Boolean
Fix include bugs