Cleaning up is never easy

- Some dangling bits from the removal of the homegrown
EmbeddedEventStore that did not make sense anymore
- Copy/Paste and a stingray: bugs solved
- Coverage increased. No, really, more scenarios covered.