Fix failing unit tests

* Additionally don't use DiskStorage to test Xml Notes, but use
  XmlNoteReader