Fix the EIP tests