diff --git a/core/src/test/kotlin/net/corda/core/serialization/amqp/AMQPTestUtils.kt b/core/src/test/kotlin/net/corda/core/serialization/amqp/AMQPTestUtils.kt
new file mode 100644
index 0000000000..5a19337f3d
--- /dev/null
+++ b/core/src/test/kotlin/net/corda/core/serialization/amqp/AMQPTestUtils.kt
@@ -0,0 +1,16 @@
+package net.corda.core.serialization.amqp.test
+
+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,
+        serializerFactory: SerializerFactory = SerializerFactory()) : SerializationOutput(serializerFactory) {
+
+    override fun writeSchema(schema: Schema, data: Data) {
+        if (verbose) println(schema)
+        super.writeSchema(schema, data)
+    }
+}
diff --git a/core/src/test/kotlin/net/corda/core/serialization/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt b/core/src/test/kotlin/net/corda/core/serialization/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt
new file mode 100644
index 0000000000..b36e540d96
--- /dev/null
+++ b/core/src/test/kotlin/net/corda/core/serialization/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt
@@ -0,0 +1,409 @@
+package net.corda.core.serialization.amqp
+
+import org.junit.Test
+import kotlin.test.*
+import net.corda.core.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
+ * those classes don't exist within the system's Class Loader the deserialiser will be forced to carpent
+ * versions of them up using its own internal class carpenter (each carpenter houses it's own loader). This
+ * replicates the situation where a receiver doesn't have some or all elements of a schema present on it's classpath
+ */
+class DeserializeNeedingCarpentrySimpleTypesTest {
+    companion object {
+        /**
+         * If you want to see the schema encoded into the envelope after serialisation change this to true
+         */
+        private const val VERBOSE = false
+    }
+
+    val sf = SerializerFactory()
+
+    @Test
+    fun singleInt() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "int" to NonNullableField(Integer::class.javaPrimitiveType!!)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(1))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(1, db::class.java.getMethod("getInt").invoke(db))
+    }
+
+    @Test
+    fun singleIntNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "int" to NullableField(Integer::class.java)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(1))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(1, db::class.java.getMethod("getInt").invoke(db))
+    }
+
+    @Test
+    fun singleIntNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "int" to NullableField(Integer::class.java)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getInt").invoke(db))
+    }
+
+    @Test
+    fun singleChar() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "char" to NonNullableField(Character::class.javaPrimitiveType!!)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance('a'))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals('a', db::class.java.getMethod("getChar").invoke(db))
+    }
+
+    @Test
+    fun singleCharNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "char" to NullableField(Character::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance('a'))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals('a', db::class.java.getMethod("getChar").invoke(db))
+    }
+
+    @Test
+    fun singleCharNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "char" to NullableField(java.lang.Character::class.java)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getChar").invoke(db))
+    }
+
+    @Test
+    fun singleLong() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "long" to NonNullableField(Long::class.javaPrimitiveType!!)
+        )))
+
+        val l : Long  = 1
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(l))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(l, (db::class.java.getMethod("getLong").invoke(db)))
+    }
+
+    @Test
+    fun singleLongNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "long" to NullableField(Long::class.javaObjectType)
+        )))
+
+        val l : Long  = 1
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(l))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(l, (db::class.java.getMethod("getLong").invoke(db)))
+    }
+
+    @Test
+    fun singleLongNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "long" to NullableField(Long::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, (db::class.java.getMethod("getLong").invoke(db)))
+    }
+
+    @Test
+    fun singleBoolean() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "boolean" to NonNullableField(Boolean::class.javaPrimitiveType!!)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(true))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(true, db::class.java.getMethod("getBoolean").invoke(db))
+    }
+
+    @Test
+    fun singleBooleanNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "boolean" to NullableField(Boolean::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(true))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(true, db::class.java.getMethod("getBoolean").invoke(db))
+    }
+
+    @Test
+    fun singleBooleanNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "boolean" to NullableField(Boolean::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getBoolean").invoke(db))
+    }
+
+    @Test
+    fun singleDouble() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "double" to NonNullableField(Double::class.javaPrimitiveType!!)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(10.0, db::class.java.getMethod("getDouble").invoke(db))
+    }
+
+    @Test
+    fun singleDoubleNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "double" to NullableField(Double::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(10.0, db::class.java.getMethod("getDouble").invoke(db))
+    }
+
+    @Test
+    fun singleDoubleNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "double" to NullableField(Double::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getDouble").invoke(db))
+    }
+
+    @Test
+    fun singleShort() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "short" to NonNullableField(Short::class.javaPrimitiveType!!)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(3.toShort()))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(3.toShort(), db::class.java.getMethod("getShort").invoke(db))
+    }
+
+    @Test
+    fun singleShortNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "short" to NullableField(Short::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(3.toShort()))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(3.toShort(), db::class.java.getMethod("getShort").invoke(db))
+    }
+
+    @Test
+    fun singleShortNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "short" to NullableField(Short::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getShort").invoke(db))
+    }
+
+    @Test
+    fun singleFloat() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "float" to NonNullableField(Float::class.javaPrimitiveType!!)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0F))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(10.0F, db::class.java.getMethod("getFloat").invoke(db))
+    }
+
+    @Test
+    fun singleFloatNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "float" to NullableField(Float::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0F))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(10.0F, db::class.java.getMethod("getFloat").invoke(db))
+    }
+
+    @Test
+    fun singleFloatNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "float" to NullableField(Float::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getFloat").invoke(db))
+    }
+
+    @Test
+    fun singleByte() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "byte" to NonNullableField(Byte::class.javaPrimitiveType!!)
+        )))
+
+        val b : Byte = 0b0101
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(b))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(b, db::class.java.getMethod("getByte").invoke(db))
+        assertEquals(0b0101, (db::class.java.getMethod("getByte").invoke(db) as Byte))
+    }
+
+    @Test
+    fun singleByteNullable() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "byte" to NullableField(Byte::class.javaObjectType)
+        )))
+
+        val b : Byte = 0b0101
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(b))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(b, db::class.java.getMethod("getByte").invoke(db))
+        assertEquals(0b0101, (db::class.java.getMethod("getByte").invoke(db) as Byte))
+    }
+
+    @Test
+    fun singleByteNullableNull() {
+        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
+                "byte" to NullableField(Byte::class.javaObjectType)
+        )))
+
+        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
+        val db = DeserializationInput(sf).deserialize(sb)
+
+        assertEquals(null, db::class.java.getMethod("getByte").invoke(db))
+    }
+
+    @Test
+    fun simpleTypeKnownInterface() {
+        val clazz = ClassCarpenter().build (ClassSchema(
+                "oneType", mapOf("name" to NonNullableField(String::class.java)),
+                interfaces = listOf (I::class.java)))
+        val testVal = "Some Person"
+        val classInstance = clazz.constructors[0].newInstance(testVal)
+
+        val serialisedBytes = TestSerializationOutput(VERBOSE, sf).serialize(classInstance)
+        val deserializedObj = DeserializationInput(sf).deserialize(serialisedBytes)
+
+        assertTrue(deserializedObj is I)
+        assertEquals(testVal, (deserializedObj as I).getName())
+    }
+
+    @Test
+    fun manyTypes() {
+        val manyClass = ClassCarpenter().build (ClassSchema("many", mapOf(
+                "intA" to NonNullableField (Int::class.java),
+                "intB" to NullableField (Integer::class.java),
+                "intC" to NullableField (Integer::class.java),
+                "strA" to NonNullableField (String::class.java),
+                "strB" to NullableField (String::class.java),
+                "strC" to NullableField (String::class.java),
+                "charA" to NonNullableField (Char::class.java),
+                "charB" to NullableField (Character::class.javaObjectType),
+                "charC" to NullableField (Character::class.javaObjectType),
+                "shortA" to NonNullableField (Short::class.javaPrimitiveType!!),
+                "shortB" to NullableField (Short::class.javaObjectType),
+                "shortC" to NullableField (Short::class.javaObjectType),
+                "longA" to NonNullableField (Long::class.javaPrimitiveType!!),
+                "longB" to NullableField(Long::class.javaObjectType),
+                "longC" to NullableField(Long::class.javaObjectType),
+                "booleanA" to NonNullableField (Boolean::class.javaPrimitiveType!!),
+                "booleanB" to NullableField (Boolean::class.javaObjectType),
+                "booleanC" to NullableField (Boolean::class.javaObjectType),
+                "doubleA" to NonNullableField (Double::class.javaPrimitiveType!!),
+                "doubleB" to NullableField (Double::class.javaObjectType),
+                "doubleC" to NullableField (Double::class.javaObjectType),
+                "floatA" to NonNullableField (Float::class.javaPrimitiveType!!),
+                "floatB" to NullableField (Float::class.javaObjectType),
+                "floatC" to NullableField (Float::class.javaObjectType),
+                "byteA" to NonNullableField (Byte::class.javaPrimitiveType!!),
+                "byteB" to NullableField (Byte::class.javaObjectType),
+                "byteC" to NullableField (Byte::class.javaObjectType))))
+
+        val serialisedBytes = TestSerializationOutput(VERBOSE, sf).serialize(
+                manyClass.constructors.first().newInstance(
+                        1, 2, null,
+                        "a", "b", null,
+                        'c', 'd', null,
+                        3.toShort(), 4.toShort(), null,
+                        100.toLong(), 200.toLong(), null,
+                        true, false, null,
+                        10.0, 20.0, null,
+                        10.0F, 20.0F, null,
+                        0b0101.toByte(), 0b1010.toByte(), null))
+
+        val deserializedObj = DeserializationInput(sf).deserialize(serialisedBytes)
+
+        assertEquals(1,    deserializedObj::class.java.getMethod("getIntA").invoke(deserializedObj))
+        assertEquals(2,    deserializedObj::class.java.getMethod("getIntB").invoke(deserializedObj))
+        assertEquals(null, deserializedObj::class.java.getMethod("getIntC").invoke(deserializedObj))
+        assertEquals("a",  deserializedObj::class.java.getMethod("getStrA").invoke(deserializedObj))
+        assertEquals("b",  deserializedObj::class.java.getMethod("getStrB").invoke(deserializedObj))
+        assertEquals(null, deserializedObj::class.java.getMethod("getStrC").invoke(deserializedObj))
+        assertEquals('c',  deserializedObj::class.java.getMethod("getCharA").invoke(deserializedObj))
+        assertEquals('d',  deserializedObj::class.java.getMethod("getCharB").invoke(deserializedObj))
+        assertEquals(null, deserializedObj::class.java.getMethod("getCharC").invoke(deserializedObj))
+        assertEquals(3.toShort(), deserializedObj::class.java.getMethod("getShortA").invoke(deserializedObj))
+        assertEquals(4.toShort(), deserializedObj::class.java.getMethod("getShortB").invoke(deserializedObj))
+        assertEquals(null,        deserializedObj::class.java.getMethod("getShortC").invoke(deserializedObj))
+        assertEquals(100.toLong(), deserializedObj::class.java.getMethod("getLongA").invoke(deserializedObj))
+        assertEquals(200.toLong(), deserializedObj::class.java.getMethod("getLongB").invoke(deserializedObj))
+        assertEquals(null,         deserializedObj::class.java.getMethod("getLongC").invoke(deserializedObj))
+        assertEquals(true,  deserializedObj::class.java.getMethod("getBooleanA").invoke(deserializedObj))
+        assertEquals(false, deserializedObj::class.java.getMethod("getBooleanB").invoke(deserializedObj))
+        assertEquals(null,  deserializedObj::class.java.getMethod("getBooleanC").invoke(deserializedObj))
+        assertEquals(10.0, deserializedObj::class.java.getMethod("getDoubleA").invoke(deserializedObj))
+        assertEquals(20.0, deserializedObj::class.java.getMethod("getDoubleB").invoke(deserializedObj))
+        assertEquals(null, deserializedObj::class.java.getMethod("getDoubleC").invoke(deserializedObj))
+        assertEquals(10.0F, deserializedObj::class.java.getMethod("getFloatA").invoke(deserializedObj))
+        assertEquals(20.0F, deserializedObj::class.java.getMethod("getFloatB").invoke(deserializedObj))
+        assertEquals(null,  deserializedObj::class.java.getMethod("getFloatC").invoke(deserializedObj))
+        assertEquals(0b0101.toByte(), deserializedObj::class.java.getMethod("getByteA").invoke(deserializedObj))
+        assertEquals(0b1010.toByte(), deserializedObj::class.java.getMethod("getByteB").invoke(deserializedObj))
+        assertEquals(null,            deserializedObj::class.java.getMethod("getByteC").invoke(deserializedObj))
+    }
+}
+
+
+
diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeNeedingCarpentryTests.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeNeedingCarpentryTests.kt
index 54e3ce915f..ea74d2ad82 100644
--- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeNeedingCarpentryTests.kt
+++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/DeserializeNeedingCarpentryTests.kt
@@ -3,28 +3,24 @@ package net.corda.core.serialization.amqp
 import org.junit.Test
 import kotlin.test.*
 import net.corda.core.serialization.carpenter.*
-import org.apache.qpid.proton.codec.Data
+import net.corda.core.serialization.amqp.test.TestSerializationOutput
 
 interface I {
     fun getName() : String
 }
 
+interface II {
+    fun getAge() : Int
+    fun getThingWithName(): I
+}
+
 /**
  * These tests work by having the class carpenter build the classes we serialise and then deserialise. Because
  * those classes don't exist within the system's Class Loader the deserialiser will be forced to carpent
  * versions of them up using its own internal class carpenter (each carpenter houses it's own loader). This
- * replicates the situation where a reciever doesn't have some or all elements of a schema present on it's classpath
+ * replicates the situation where a receiver doesn't have some or all elements of a schema present on it's classpath
  */
 class DeserializeNeedingCarpentryTests {
-    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 {
         /**
@@ -47,300 +43,6 @@ class DeserializeNeedingCarpentryTests {
         assertEquals (testVal, deserializedObj::class.java.getMethod("getA").invoke(deserializedObj))
     }
 
-    @Test
-    fun singleInt() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "int" to NonNullableField(Integer::class.javaPrimitiveType!!)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(1))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(1, db::class.java.getMethod("getInt").invoke(db))
-    }
-
-    @Test
-    fun singleIntNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "int" to NullableField(Integer::class.java)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(1))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(1, db::class.java.getMethod("getInt").invoke(db))
-    }
-
-    @Test
-    fun singleIntNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "int" to NullableField(Integer::class.java)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getInt").invoke(db))
-    }
-
-    @Test
-    fun singleChar() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "char" to NonNullableField(Character::class.javaPrimitiveType!!)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance('a'))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals('a', db::class.java.getMethod("getChar").invoke(db))
-    }
-
-    @Test
-    fun singleCharNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "char" to NullableField(Character::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance('a'))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals('a', db::class.java.getMethod("getChar").invoke(db))
-    }
-
-    @Test
-    fun singleCharNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "char" to NullableField(java.lang.Character::class.java)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getChar").invoke(db))
-    }
-
-    @Test
-    fun singleLong() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "long" to NonNullableField(Long::class.javaPrimitiveType!!)
-        )))
-
-        val l : Long  = 1
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(l))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(l, (db::class.java.getMethod("getLong").invoke(db)))
-    }
-
-    @Test
-    fun singleLongNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "long" to NullableField(Long::class.javaObjectType)
-        )))
-
-        val l : Long  = 1
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(l))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(l, (db::class.java.getMethod("getLong").invoke(db)))
-    }
-
-    @Test
-    fun singleLongNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "long" to NullableField(Long::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, (db::class.java.getMethod("getLong").invoke(db)))
-    }
-
-    @Test
-    fun singleBoolean() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "boolean" to NonNullableField(Boolean::class.javaPrimitiveType!!)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(true))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(true, db::class.java.getMethod("getBoolean").invoke(db))
-    }
-
-    @Test
-    fun singleBooleanNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "boolean" to NullableField(Boolean::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(true))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(true, db::class.java.getMethod("getBoolean").invoke(db))
-    }
-
-    @Test
-    fun singleBooleanNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "boolean" to NullableField(Boolean::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getBoolean").invoke(db))
-    }
-
-    @Test
-    fun singleDouble() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "double" to NonNullableField(Double::class.javaPrimitiveType!!)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(10.0, db::class.java.getMethod("getDouble").invoke(db))
-    }
-
-    @Test
-    fun singleDoubleNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "double" to NullableField(Double::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(10.0, db::class.java.getMethod("getDouble").invoke(db))
-    }
-
-    @Test
-    fun singleDoubleNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "double" to NullableField(Double::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getDouble").invoke(db))
-    }
-
-    @Test
-    fun singleShort() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "short" to NonNullableField(Short::class.javaPrimitiveType!!)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(3.toShort()))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(3.toShort(), db::class.java.getMethod("getShort").invoke(db))
-    }
-
-    @Test
-    fun singleShortNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "short" to NullableField(Short::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(3.toShort()))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(3.toShort(), db::class.java.getMethod("getShort").invoke(db))
-    }
-
-    @Test
-    fun singleShortNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "short" to NullableField(Short::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getShort").invoke(db))
-    }
-
-    @Test
-    fun singleFloat() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "float" to NonNullableField(Float::class.javaPrimitiveType!!)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0F))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(10.0F, db::class.java.getMethod("getFloat").invoke(db))
-    }
-
-    @Test
-    fun singleFloatNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "float" to NullableField(Float::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(10.0F))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(10.0F, db::class.java.getMethod("getFloat").invoke(db))
-    }
-
-    @Test
-    fun singleFloatNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "float" to NullableField(Float::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getFloat").invoke(db))
-    }
-
-    @Test
-    fun singleByte() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "byte" to NonNullableField(Byte::class.javaPrimitiveType!!)
-        )))
-
-        val b : Byte = 0b0101
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(b))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(b, db::class.java.getMethod("getByte").invoke(db))
-        assertEquals(0b0101, (db::class.java.getMethod("getByte").invoke(db) as Byte))
-    }
-
-    @Test
-    fun singleByteNullable() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "byte" to NullableField(Byte::class.javaObjectType)
-        )))
-
-        val b : Byte = 0b0101
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(b))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(b, db::class.java.getMethod("getByte").invoke(db))
-        assertEquals(0b0101, (db::class.java.getMethod("getByte").invoke(db) as Byte))
-    }
-
-    @Test
-    fun singleByteNullableNull() {
-        val clazz = ClassCarpenter().build(ClassSchema("single", mapOf(
-                "byte" to NullableField(Byte::class.javaObjectType)
-        )))
-
-        val sb = TestSerializationOutput(VERBOSE, sf).serialize(clazz.constructors.first().newInstance(null))
-        val db = DeserializationInput(sf).deserialize(sb)
-
-        assertEquals(null, db::class.java.getMethod("getByte").invoke(db))
-    }
-
     @Test
     fun simpleTypeKnownInterface() {
         val clazz = ClassCarpenter().build (ClassSchema(
@@ -414,6 +116,38 @@ class DeserializeNeedingCarpentryTests {
         }
     }
 
+    @Test
+    fun mapOfInterfaces() {
+        val cc = ClassCarpenter()
+
+        val implementsI = cc.build(ClassSchema(
+                "implementsI", mapOf("name" to NonNullableField(String::class.java)),
+                interfaces = listOf (I::class.java)))
+
+        val implementsII = cc.build(ClassSchema("ImplementsII", mapOf (
+                "age" to NonNullableField(Int::class.java),
+                "thingWithName" to NullableField(I::class.java)),
+                interfaces = listOf (II::class.java)))
+
+        val wrapper = cc.build(ClassSchema("wrapper", mapOf (
+                "IIs" to NonNullableField(MutableMap::class.java))))
+
+        val tmp: MutableMap<String, II> = mutableMapOf()
+        val toSerialise = wrapper.constructors.first().newInstance(tmp)
+        val testData = arrayOf(Pair ("Fred", 12), Pair ("Bob", 50), Pair ("Thirsty", 101))
+
+        testData.forEach {
+            (wrapper.getMethod("getIIs").invoke(toSerialise) as MutableMap<String, II>)[it.first] =
+                    implementsII.constructors.first().newInstance(it.second,
+                            implementsI.constructors.first().newInstance(it.first) as I) as II
+        }
+
+        // Now do the actual test by serialising and deserialising [wrapper]
+        val serialisedBytes = TestSerializationOutput(VERBOSE, sf).serialize(wrapper)
+        val deserializedObj = DeserializationInput(sf).deserialize(serialisedBytes)
+
+    }
+
     @Test
     fun unknownInterface() {
         val cc = ClassCarpenter()
@@ -436,80 +170,4 @@ class DeserializeNeedingCarpentryTests {
         assertEquals("timmy", deserializedObj::class.java.getMethod("getName").invoke(deserializedObj))
         assertEquals(12, deserializedObj::class.java.getMethod("getAge").invoke(deserializedObj))
     }
-
-    @Test
-    fun manyTypes() {
-        val cc = ClassCarpenter()
-
-        val manyClass = cc.build (ClassSchema("many", mapOf(
-                "intA" to NonNullableField (Int::class.java),
-                "intB" to NullableField (Integer::class.java),
-                "intC" to NullableField (Integer::class.java),
-                "strA" to NonNullableField (String::class.java),
-                "strB" to NullableField (String::class.java),
-                "strC" to NullableField (String::class.java),
-                "charA" to NonNullableField (Char::class.java),
-                "charB" to NullableField (Character::class.javaObjectType),
-                "charC" to NullableField (Character::class.javaObjectType),
-                "shortA" to NonNullableField (Short::class.javaPrimitiveType!!),
-                "shortB" to NullableField (Short::class.javaObjectType),
-                "shortC" to NullableField (Short::class.javaObjectType),
-                "longA" to NonNullableField (Long::class.javaPrimitiveType!!),
-                "longB" to NullableField(Long::class.javaObjectType),
-                "longC" to NullableField(Long::class.javaObjectType),
-                "booleanA" to NonNullableField (Boolean::class.javaPrimitiveType!!),
-                "booleanB" to NullableField (Boolean::class.javaObjectType),
-                "booleanC" to NullableField (Boolean::class.javaObjectType),
-                "doubleA" to NonNullableField (Double::class.javaPrimitiveType!!),
-                "doubleB" to NullableField (Double::class.javaObjectType),
-                "doubleC" to NullableField (Double::class.javaObjectType),
-                "floatA" to NonNullableField (Float::class.javaPrimitiveType!!),
-                "floatB" to NullableField (Float::class.javaObjectType),
-                "floatC" to NullableField (Float::class.javaObjectType),
-                "byteA" to NonNullableField (Byte::class.javaPrimitiveType!!),
-                "byteB" to NullableField (Byte::class.javaObjectType),
-                "byteC" to NullableField (Byte::class.javaObjectType))))
-
-        val serialisedBytes = TestSerializationOutput(VERBOSE, sf).serialize(
-                manyClass.constructors.first().newInstance(
-                        1, 2, null,
-                        "a", "b", null,
-                        'c', 'd', null,
-                        3.toShort(), 4.toShort(), null,
-                        100.toLong(), 200.toLong(), null,
-                        true, false, null,
-                        10.0, 20.0, null,
-                        10.0F, 20.0F, null,
-                        0b0101.toByte(), 0b1010.toByte(), null))
-
-        val deserializedObj = DeserializationInput(sf).deserialize(serialisedBytes)
-
-        assertEquals(1,    deserializedObj::class.java.getMethod("getIntA").invoke(deserializedObj))
-        assertEquals(2,    deserializedObj::class.java.getMethod("getIntB").invoke(deserializedObj))
-        assertEquals(null, deserializedObj::class.java.getMethod("getIntC").invoke(deserializedObj))
-        assertEquals("a",  deserializedObj::class.java.getMethod("getStrA").invoke(deserializedObj))
-        assertEquals("b",  deserializedObj::class.java.getMethod("getStrB").invoke(deserializedObj))
-        assertEquals(null, deserializedObj::class.java.getMethod("getStrC").invoke(deserializedObj))
-        assertEquals('c',  deserializedObj::class.java.getMethod("getCharA").invoke(deserializedObj))
-        assertEquals('d',  deserializedObj::class.java.getMethod("getCharB").invoke(deserializedObj))
-        assertEquals(null, deserializedObj::class.java.getMethod("getCharC").invoke(deserializedObj))
-        assertEquals(3.toShort(), deserializedObj::class.java.getMethod("getShortA").invoke(deserializedObj))
-        assertEquals(4.toShort(), deserializedObj::class.java.getMethod("getShortB").invoke(deserializedObj))
-        assertEquals(null,        deserializedObj::class.java.getMethod("getShortC").invoke(deserializedObj))
-        assertEquals(100.toLong(), deserializedObj::class.java.getMethod("getLongA").invoke(deserializedObj))
-        assertEquals(200.toLong(), deserializedObj::class.java.getMethod("getLongB").invoke(deserializedObj))
-        assertEquals(null,         deserializedObj::class.java.getMethod("getLongC").invoke(deserializedObj))
-        assertEquals(true,  deserializedObj::class.java.getMethod("getBooleanA").invoke(deserializedObj))
-        assertEquals(false, deserializedObj::class.java.getMethod("getBooleanB").invoke(deserializedObj))
-        assertEquals(null,  deserializedObj::class.java.getMethod("getBooleanC").invoke(deserializedObj))
-        assertEquals(10.0, deserializedObj::class.java.getMethod("getDoubleA").invoke(deserializedObj))
-        assertEquals(20.0, deserializedObj::class.java.getMethod("getDoubleB").invoke(deserializedObj))
-        assertEquals(null, deserializedObj::class.java.getMethod("getDoubleC").invoke(deserializedObj))
-        assertEquals(10.0F, deserializedObj::class.java.getMethod("getFloatA").invoke(deserializedObj))
-        assertEquals(20.0F, deserializedObj::class.java.getMethod("getFloatB").invoke(deserializedObj))
-        assertEquals(null,  deserializedObj::class.java.getMethod("getFloatC").invoke(deserializedObj))
-        assertEquals(0b0101.toByte(), deserializedObj::class.java.getMethod("getByteA").invoke(deserializedObj))
-        assertEquals(0b1010.toByte(), deserializedObj::class.java.getMethod("getByteB").invoke(deserializedObj))
-        assertEquals(null,            deserializedObj::class.java.getMethod("getByteC").invoke(deserializedObj))
-    }
 }