Modularizing adapters and updating unit tests. Fixed memcache unit test.