GRADLE-3147: Expanded test cases. Avoid duplicating general assumptions for each test scenario.