NoteStorage extended. Tests added