Tests for CROSSDATA-270 fixed