Tests for issues CROSSDATA-150 & CROSSDATA-152 added.