bugfix, tests for new data adapter capability