Boolean type fix and testing