Started testing adapters.
Fixed a bug
Merge branch 'Ossi_test'