Feature/0.9.6

Actually we can! Could you add in a couple of eid= into the test suite (mutate existing tests)