Add adapter tests
Change adapter from superclass to mixed-in module
Composition over inheritance
Include missing adapter files