Update composite_spec to follow new adding API.
Fix extra space.
Move RSpecs to one directory.

This should allow them to be run together much easier.

Some of these RSpecs have been broken by refactoring, and will be fixed
soon.
Add spec for update channel notifications.
Fix up item_spec.
Add channel and handler checks to specs.

Also fix up use of old driver APIs.