Added more test combinations.

+review REVIEW-5257