prepared handling of incoming and outgoing notes
extended functionality of data-provider (contains) and aligned UnitTest to changes