Switch to eqc, more tests