Rebase/fix Adapter tests #96

This updates (via rebase and fixing change conflicts) #96 on top of master.

What needs review on this are specifically the changes to the Reel adapter to make the specs work, and to make sure I didn't make a mess of the manual conflict resolution.