Fixes minor issues to support adapters and mock tests
Resolving conflicts
Fixing tests with new adapter mechanism