improved tests for NotesManager
Merge remote-tracking branch 'origin/master'