refaktoring, simplifying nested callback in offer test
clearing Offer collection before tests
Merge branch 'master' into refactoring
fixed subscription test and merge with refactoring