replace eqc with proper
fix another glitch in tests