CB-6695 Added tests to verify CB-4520 + CB-4519