DataMarketAccessTest, Fixed Implementation

Beside the test, features of the previous implementation were ported to this version