Issues/3

Fixes issue #3 - Enable different adapters
Partly fixes issue #1 - Smaller test file