Fixes tests.

lib/felix.unit.test.properties

@@ -72,7 +72,7 @@ felix.auto.start.31= \
  reference:file:sc-bundles/notification-service.jar
 
 felix.auto.start.40= \
- reference:file:sc-bundles/hid.jar \
+ reference:file:sc-bundles/hid-service.jar \
  reference:file:sc-bundles/ui-service.jar \
  reference:file:sc-bundles/credentialsstorage.jar \
  reference:file:sc-bundles/argdelegation-service.jar \
@@ -120,7 +120,7 @@ felix.auto.start.60= \
  reference:file:sc-bundles/callhistory.jar \
  reference:file:sc-bundles/filehistory.jar \
  reference:file:sc-bundles/metahistory.jar \
- reference:file:sc-bundles/plugin-nimbuzzavatars.jar \
+ reference:file:sc-bundles/customavatar-service.jar \
  reference:file:sc-bundles/systray-service.jar \
  reference:file:sc-bundles/osdependent.jar