remove some unnecessary parentheses
cleanup the tests a bit
test cases