Refactored: adapters and its tests
Merge pull request #216 from toin0u/RefactorAdapters

Refactored: adapters and its tests