adding more boolean tests