INT-3351 More Tests
INT-3351: PR comments