fixup initial pass of Bool and tests