GRADLE-3147: Added tests cases for transitive diamond module excludes. Tidy up of test classes.