Updated more tests.
Generalized eqc functions.
Merge.