continue adding testcases; fixed a issue in smart if evaluation