Improved test for adapter
Finished unit-test for adapter test