add more comparison tests
separate comparisons and expressions
rename file and fix merge error