HCOLL-32 Add collections-test for OSGi and other tests