*8995* Adapt existing tests to data suite