Gradle-771 Fixed up tests and removed imports that were breaking the build