Slight improvments to the .dot output
All the unit-tests for the in-memory store works again