diff --git a/confidential-identities/build.gradle b/confidential-identities/build.gradle
index fcad3bbf8c..04212b3df1 100644
--- a/confidential-identities/build.gradle
+++ b/confidential-identities/build.gradle
@@ -11,17 +11,15 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Corda Experimental Confidential Identities'
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
 dependencies {
     // Note the :confidential-identities module is a CorDapp in its own right
     // and CorDapps using :confidential-identities features should use 'cordapp' not 'compile' linkage.
     cordaCompile project(':core')
 
+    // Quasar, for suspendable fibres.
+    compileOnly "co.paralleluniverse:quasar-core:$quasar_version:jdk8"
+
+    testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testCompile "junit:junit:$junit_version"
 
     // Guava: Google test library (collections test suite)
@@ -31,28 +29,8 @@ dependencies {
     testCompile project(":node")
     testCompile project(":node-driver")
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-
-    // Quasar, for suspendable fibres.
-    compileOnly "co.paralleluniverse:quasar-core:$quasar_version:jdk8"
-
     // AssertJ: for fluent assertions for testing
-    testCompile "org.assertj:assertj-core:${assertj_version}"
-}
-
-configurations {
-    testArtifacts.extendsFrom testRuntime
-}
-
-task testJar(type: Jar) {
-    classifier "tests"
-    from sourceSets.test.output
-}
-
-artifacts {
-    testArtifacts testJar
+    testCompile "org.assertj:assertj-core:$assertj_version"
 }
 
 jar {
diff --git a/confidential-identities/src/main/kotlin/net/corda/confidential/SwapIdentitiesHandler.kt b/confidential-identities/src/main/kotlin/net/corda/confidential/SwapIdentitiesHandler.kt
index 89a36deeb0..67d9e0b7b6 100644
--- a/confidential-identities/src/main/kotlin/net/corda/confidential/SwapIdentitiesHandler.kt
+++ b/confidential-identities/src/main/kotlin/net/corda/confidential/SwapIdentitiesHandler.kt
@@ -1,6 +1,6 @@
-package net.corda.confidential;
+package net.corda.confidential
 
-import co.paralleluniverse.fibers.Suspendable;
+import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.flows.FlowLogic
 import net.corda.core.identity.Party
 import net.corda.core.identity.PartyAndCertificate