Gradle: Integration Test Fixes and Cleanup