More unit tests
More robust tests for adapter implementation