Merge pull request #6 from neykov/osgi

Adress last OSGi merge comments
Fix test to reflect changes in tested code - added delete item from catalog, operations increased with one.