beginning final set of functests
fixing merge conflict
a lot of iter2 tests
resolved merge conflicts for iter2 tests