INT-3351 More Tests