Made eid single valued; added tests for eid