Add tests for Adaptor