Post rebase fixes

- Add missing import
- Deal with files that need to move from core to nodeapi.internal
- Fix up the imports

node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/carpenter/MetaCarpenter.kt

@@ -97,7 +97,6 @@ class MetaCarpenter(schemas : CarpenterSchemas,
     }
 }
 
-class TestMetaCarpenter(schemas: CarpenterSchemas) : MetaCarpenterBase(schemas) {
 class TestMetaCarpenter(schemas : CarpenterSchemas,
                         cc : ClassCarpenter = ClassCarpenter()) : MetaCarpenterBase(schemas, cc) {
     override fun build() {

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPTestUtils.kt

@@ -1,9 +1,6 @@
-package net.corda.core.serialization.amqp.test
+package net.corda.nodeapi.internal.serialization.amqp
 
 import org.apache.qpid.proton.codec.Data
-import net.corda.core.serialization.amqp.Schema
-import net.corda.core.serialization.amqp.SerializerFactory
-import net.corda.core.serialization.amqp.SerializationOutput
 
 class TestSerializationOutput(
         private val verbose: Boolean,

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeAndReturnEnvelopeTests.kt

@@ -8,6 +8,7 @@ import kotlin.test.assertTrue
 class DeserializeAndReturnEnvelopeTests {
 
     fun testName(): String = Thread.currentThread().stackTrace[2].methodName
+
     @Suppress("NOTHING_TO_INLINE")
     inline fun classTestName(clazz: String) = "${this.javaClass.name}\$${testName()}\$$clazz"
 

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt

@@ -1,9 +1,8 @@
-package net.corda.core.serialization.amqp
+package net.corda.nodeapi.internal.serialization.amqp
 
 import org.junit.Test
 import kotlin.test.*
-import net.corda.core.serialization.carpenter.*
+import net.corda.nodeapi.internal.serialization.carpenter.*
-import net.corda.core.serialization.amqp.test.TestSerializationOutput
 
 /**
  * These tests work by having the class carpenter build the classes we serialise and then deserialise. Because

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeNeedingCarpentryTests.kt

@@ -1,9 +1,8 @@
-package net.corda.core.serialization.amqp
+package net.corda.nodeapi.internal.serialization.amqp
 
 import org.junit.Test
 import kotlin.test.*
-import net.corda.core.serialization.carpenter.*
+import net.corda.nodeapi.internal.serialization.carpenter.*
-import net.corda.core.serialization.amqp.test.TestSerializationOutput
 
 interface I {
     fun getName() : String

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeSimpleTypesTests.kt

@@ -1,6 +1,5 @@
 package net.corda.nodeapi.internal.serialization.amqp
 
-import org.apache.qpid.proton.codec.Data
 import org.junit.Test
 import kotlin.test.assertEquals
 
@@ -9,15 +8,6 @@ import kotlin.test.assertEquals
 // char property of the class would've been treated as an Integer and given to the constructor
 // as such
 class DeserializeSimpleTypesTests {
-    class TestSerializationOutput(
-            private val verbose: Boolean,
-            serializerFactory: SerializerFactory = SerializerFactory()) : SerializationOutput(serializerFactory) {
-
-        override fun writeSchema(schema: Schema, data: Data) {
-            if (verbose) println(schema)
-            super.writeSchema(schema, data)
-        }
-    }
 
     companion object {
         /**

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/carpenter/ClassCarpenterTestUtils.kt

@@ -2,6 +2,7 @@ package net.corda.nodeapi.internal.serialization.carpenter
 
 import net.corda.nodeapi.internal.serialization.amqp.Field
 import net.corda.nodeapi.internal.serialization.amqp.Schema
+import net.corda.nodeapi.internal.serialization.amqp.TypeNotation
 import net.corda.nodeapi.internal.serialization.amqp.CompositeType
 import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
 import net.corda.nodeapi.internal.serialization.amqp.SerializationOutput