diff --git a/interfaces2016/src/main/resources/xsd/FixInterfaces.xsd b/interfaces2016/src/main/resources/xsd/FixInterfaces.xsd
index 8e4cb7ed..bdcf8ac7 100644
--- a/interfaces2016/src/main/resources/xsd/FixInterfaces.xsd
+++ b/interfaces2016/src/main/resources/xsd/FixInterfaces.xsd
@@ -4,7 +4,7 @@
 	<xs:annotation>
 		<xs:documentation>
 			FIX interface configuration
-			© Copyright 2016-2017 FIX Protocol Limited
+			© Copyright 2016-2018 FIX Protocol Limited
 			Creative Commons Attribution-NoDerivatives 4.0
 			International Public License
 		</xs:documentation>
diff --git a/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/Populator.java b/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/Populator.java
index a8d60ab9..a8226084 100644
--- a/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/Populator.java
+++ b/model-quickfix/src/main/java/io/fixprotocol/orchestra/model/quickfix/Populator.java
@@ -114,7 +114,7 @@ private void populateFieldMap(FieldMap fieldMap, List<?> members, Scope outScope
               new GroupInstanceScope(group, groupType, repositoryAdapter, symbolResolver, evaluator)) {
             try (Scope local = (Scope) symbolResolver.resolve(SymbolResolver.LOCAL_ROOT)) {
               local.nest(new PathStep(groupType.getName()), groupScope);
-              populateFieldMap(group, blockAssignments.get(i).getFieldRef(), groupScope);
+              populateFieldMap(group, blockAssignments.get(i).getComponentRefOrGroupRefOrFieldRef(), groupScope);
               fieldMap.addGroup(group);
             }
           } catch (Exception e) {
@@ -126,7 +126,7 @@ private void populateFieldMap(FieldMap fieldMap, List<?> members, Scope outScope
         ComponentRefType componentRefType = (ComponentRefType) member;
         List<BlockAssignmentType> blockAssignments = componentRefType.getBlockAssignment();
         if (blockAssignments.size() > 0) {
-          List<?> blockElements = blockAssignments.get(0).getFieldRef();
+          List<?> blockElements = blockAssignments.get(0).getComponentRefOrGroupRefOrFieldRef();
           populateFieldMap(fieldMap, blockElements, outScope);
         }
       }
diff --git a/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/MessageScopeTest.java b/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/MessageScopeTest.java
index 5a8fbeb4..482b4a56 100644
--- a/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/MessageScopeTest.java
+++ b/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/MessageScopeTest.java
@@ -17,6 +17,7 @@
 import static org.junit.Assert.*;
 
 import java.io.File;
+import java.io.InputStream;
 import java.math.BigDecimal;
 
 import javax.xml.bind.JAXBContext;
@@ -47,7 +48,7 @@ public class MessageScopeTest {
   
   @BeforeClass
   public static void setupOnce() throws Exception  {
-    repository = unmarshal(new File("mit_2016.xml"));
+    repository = unmarshal(Thread.currentThread().getContextClassLoader().getResourceAsStream("mit_2016.xml"));
   }
 
   private MessageScope messageScope;
@@ -136,7 +137,7 @@ public void testResolveGroupPredicate() {
     assertEquals(new BigDecimal("12.31"), node2.getValue());
   }
   
-  private static Repository unmarshal(File inputFile) throws JAXBException {
+  private static Repository unmarshal(InputStream inputFile) throws JAXBException {
     JAXBContext jaxbContext = JAXBContext.newInstance(Repository.class);
     Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
     return (Repository) jaxbUnmarshaller.unmarshal(inputFile);
diff --git a/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/PopulatorTest.java b/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/PopulatorTest.java
index 10a2639a..9d1b0052 100644
--- a/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/PopulatorTest.java
+++ b/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/PopulatorTest.java
@@ -14,9 +14,9 @@
  */
 package io.fixprotocol.orchestra.model.quickfix;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
-import java.io.File;
+import java.io.InputStream;
 import java.util.function.Function;
 
 import javax.xml.bind.JAXBContext;
@@ -32,7 +32,6 @@
 import io.fixprotocol.orchestra.model.ModelException;
 import io.fixprotocol.orchestra.model.SymbolResolver;
 import quickfix.Group;
-import quickfix.Message;
 import quickfix.field.Account;
 import quickfix.field.ClOrdID;
 import quickfix.field.OrdType;
@@ -51,7 +50,7 @@ public class PopulatorTest {
 
   @BeforeClass
   public static void setupOnce() throws Exception {
-    repository = unmarshal(new File("mit_2016.xml"));
+    repository = unmarshal(Thread.currentThread().getContextClassLoader().getResourceAsStream("mit_2016.xml"));
   }
 
   private RepositoryAdapter repositoryAdapter;
@@ -139,7 +138,7 @@ public void testPopulate() throws ModelException, quickfix.FieldNotFound {
     assertEquals(clOrdId, outboundMessage.getClOrdID().getValue());
    }
 
-  private static Repository unmarshal(File inputFile) throws JAXBException {
+  private static Repository unmarshal(InputStream inputFile) throws JAXBException {
     JAXBContext jaxbContext = JAXBContext.newInstance(Repository.class);
     Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
     return (Repository) jaxbUnmarshaller.unmarshal(inputFile);
diff --git a/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/ValidatorTest.java b/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/ValidatorTest.java
index ff5cdefd..a0415427 100644
--- a/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/ValidatorTest.java
+++ b/model-quickfix/src/test/java/io/fixprotocol/orchestra/model/quickfix/ValidatorTest.java
@@ -1,8 +1,9 @@
 package io.fixprotocol.orchestra.model.quickfix;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import java.io.File;
+import java.io.InputStream;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -17,20 +18,7 @@
 import io.fixprotocol._2016.fixrepository.Repository;
 import io.fixprotocol.orchestra.model.SymbolResolver;
 import io.fixprotocol.orchestra.model.TestException;
-import quickfix.Message;
 import quickfix.SessionID;
-import quickfix.SystemTime;
-import quickfix.field.BeginString;
-import quickfix.field.CheckSum;
-import quickfix.field.MsgSeqNum;
-import quickfix.field.MsgType;
-import quickfix.field.SenderCompID;
-import quickfix.field.SenderLocationID;
-import quickfix.field.SenderSubID;
-import quickfix.field.SendingTime;
-import quickfix.field.TargetCompID;
-import quickfix.field.TargetLocationID;
-import quickfix.field.TargetSubID;
 import quickfix.field.TradSesStatus;
 import quickfix.field.TradingSessionID;
 import quickfix.fix50sp2.TradingSessionStatus;
@@ -44,7 +32,7 @@ public class ValidatorTest {
 
   @BeforeClass
   public static void setupOnce() throws Exception {
-    repository = unmarshal(new File("mit_2016.xml"));
+    repository = unmarshal(Thread.currentThread().getContextClassLoader().getResourceAsStream("mit_2016.xml"));
   }
 
   @Before
@@ -56,7 +44,7 @@ public void setUp() throws Exception {
     validator = new Validator(repositoryAdapter, symbolResolver);
   }
 
-  private static Repository unmarshal(File inputFile) throws JAXBException {
+  private static Repository unmarshal(InputStream inputFile) throws JAXBException {
     JAXBContext jaxbContext = JAXBContext.newInstance(Repository.class);
     Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
     return (Repository) jaxbUnmarshaller.unmarshal(inputFile);
diff --git a/repository2016/src/main/resources/xsd/FixRepository2016.xsd b/repository2016/src/main/resources/xsd/FixRepository2016.xsd
index c934fb53..6c3662d3 100644
--- a/repository2016/src/main/resources/xsd/FixRepository2016.xsd
+++ b/repository2016/src/main/resources/xsd/FixRepository2016.xsd
@@ -3,7 +3,7 @@
 	<xs:annotation>
 		<xs:documentation>
 			FIX Repository standard structure of messages with workflow
-			© Copyright 2016-2017 FIX Protocol Limited
+			© Copyright 2016-2018 FIX Protocol Limited
 			Creative Commons Attribution-NoDerivatives 4.0
 			International Public License
 		</xs:documentation>