Added tests and fixed bug in BooleanMaker