moved adapters to same source file than the actual implementation
extracted method
renamed a test case