GRADLE-3147: Removed redundancy in test cases.