Add logical operators, and do some cleanup of tests and operators.