Updated test suite and adapter