diff --git a/.travis.yml b/.travis.yml
index 69e4b89..b5810c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-dist: precise
-
+dist: trusty
 sudo: false
 
 language: java
@@ -8,11 +7,12 @@ before_install:
     # Temp workaround to remove old references to codehaus repos
 - rm ~/.m2/settings.xml
 
+
 jdk:
-  # - openjdk6
-  #### - openjdk7  temp...
-  - oraclejdk7
+  - openjdk7
+  - openjdk8
   - oraclejdk8
+  # - oraclejdk9  # error with com/sun/codemodel/CodeWriter
 
 install:
 
diff --git a/README.md b/README.md
index e7667c9..01ccdf1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/LEMS/org.lemsml.model.svg?branch=master)](https://travis-ci.org/LEMS/org.lemsml.model)
+[![Build Status](https://travis-ci.com/LEMS/org.lemsml.model.svg?branch=master)](https://travis-ci.com/LEMS/org.lemsml.model)
 
 org.lemsml.model
 ================
diff --git a/pom.xml b/pom.xml
index b1f57e8..bc10509 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,61 +1,65 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.lemsml.model</groupId>
-	<artifactId>org.lemsml.model</artifactId>
-	<version>0.0.5</version>
-	<packaging>bundle</packaging>
-	<properties>
-		<build.version2>0.9.0</build.version2>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>de.twentyeleven.skysail</groupId>
-			<artifactId>org.antlr.stringtemplate-osgi</artifactId>
-			<version>4.0.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
-			<artifactId>jaxb2-basics</artifactId>
-			<version>0.9.3</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin</artifactId>
-			<version>0.12.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
-			<artifactId>jaxb2-fluent-api</artifactId>
-			<version>3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-		</dependency>
-		<dependency>
-			<groupId>org.lemsml.exprparser</groupId>
-			<artifactId>org.lemsml.exprparser</artifactId>
-			<version>0.0.5</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>18.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.xmlunit</groupId>
-			<artifactId>xmlunit-core</artifactId>
-			<version>2.2.1</version>
-		</dependency>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lemsml.model</groupId>
+    <artifactId>org.lemsml.model</artifactId>
+    <version>0.0.5</version>
+    <packaging>bundle</packaging>
+    <properties>
+        <build.version2>0.9.0</build.version2>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>de.twentyeleven.skysail</groupId>
+            <artifactId>org.antlr.stringtemplate-osgi</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.jvnet.jaxb2_commons</groupId>
+            <artifactId>jaxb2-basics</artifactId>
+            <version>0.9.3</version>
+        </dependency>
+        
+        
+        <dependency>
+            <groupId>org.jvnet.jaxb2.maven2</groupId>
+            <artifactId>maven-jaxb2-plugin</artifactId>
+            <version>0.12.3</version>
+        </dependency>
+        
+        
+        <dependency>
+            <groupId>org.jvnet.jaxb2_commons</groupId>
+            <artifactId>jaxb2-fluent-api</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.lemsml.exprparser</groupId>
+            <artifactId>org.lemsml.exprparser</artifactId>
+            <version>0.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>18.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>2.2.1</version>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.massfords/jaxb-visitor -->
         <dependency>
@@ -66,146 +70,146 @@
 
 
 
-	</dependencies>
+    </dependencies>
 
 
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<configuration>
-					<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
-					<includeScope>runtime</includeScope>
-					<excludeScope>provided</excludeScope>
-				</configuration>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.3.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<manifestLocation>src/main/java/META-INF</manifestLocation>
-					<supportedProjectTypes>
-						<supportedProjectType>jar</supportedProjectType>
-						<supportedProjectType>bundle</supportedProjectType>
-					</supportedProjectTypes>
-					<instructions>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-						<Bundle-Version>${project.version}</Bundle-Version>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<inherited>true</inherited>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.jvnet.jaxb2.maven2</groupId>
-				<artifactId>maven-jaxb2-plugin</artifactId>
-				<version>0.12.3</version>
-				<executions>
-					<execution>
-						<id>LEMSML</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<specVersion>2.2</specVersion>
-							<extension>true</extension>
-							<args>
-								<arg>-Xinheritance</arg>
-								<arg>-XtoString</arg>
-								<arg>-Xsimplify</arg>
-								<arg>-Xsimplify-usePluralForm=true</arg>
-								<arg>-Xvisitor</arg>
-								<arg>-Xvisitor-package:org.lemsml.visitors</arg>
-								<arg>-Xfluent-api</arg>
-							</args>
-							<bindingDirectory>src/main/resources/Schemas</bindingDirectory>
-							<bindingIncludes>
-								<include>LEMS_v${build.version2}.xjb</include>
-							</bindingIncludes>
-							<schemaDirectory>src/main/resources/Schemas</schemaDirectory>
-							<generateDirectory>${project.build.directory}/generated-sources/LEMS</generateDirectory>
-							<schemaIncludes>
-								<include>LEMS_v${build.version2}.xsd</include>
-							</schemaIncludes>
-							<plugins>
-								<plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
+                    <includeScope>runtime</includeScope>
+                    <excludeScope>provided</excludeScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <manifestLocation>src/main/java/META-INF</manifestLocation>
+                    <supportedProjectTypes>
+                        <supportedProjectType>jar</supportedProjectType>
+                        <supportedProjectType>bundle</supportedProjectType>
+                    </supportedProjectTypes>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <inherited>true</inherited>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.12.3</version>
+                <executions>
+                    <execution>
+                        <id>LEMSML</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <specVersion>2.2</specVersion>
+                            <extension>true</extension>
+                            <args>
+                                <arg>-Xinheritance</arg>
+                                <arg>-XtoString</arg>
+                                <arg>-Xsimplify</arg>
+                                <arg>-Xsimplify-usePluralForm=true</arg>
+                                <arg>-Xvisitor</arg>
+                                <arg>-Xvisitor-package:org.lemsml.visitors</arg>
+                                <arg>-Xfluent-api</arg>
+                            </args>
+                            <bindingDirectory>src/main/resources/Schemas</bindingDirectory>
+                            <bindingIncludes>
+                                <include>LEMS_v${build.version2}.xjb</include>
+                            </bindingIncludes>
+                            <schemaDirectory>src/main/resources/Schemas</schemaDirectory>
+                            <generateDirectory>${project.build.directory}/generated-sources/LEMS</generateDirectory>
+                            <schemaIncludes>
+                                <include>LEMS_v${build.version2}.xsd</include>
+                            </schemaIncludes>
+                            <plugins>
+                                <plugin>
                                     <groupId>com.massfords</groupId>
                                     <artifactId>jaxb-visitor</artifactId>
                                     <version>2.3</version>
-								</plugin>
-								<plugin>
-									<groupId>org.jvnet.jaxb2_commons</groupId>
-									<artifactId>jaxb2-basics</artifactId>
-									<version>0.9.3</version>
-								</plugin>
-								<plugin>
-									<groupId>org.jvnet.jaxb2_commons</groupId>
-									<artifactId>jaxb2-fluent-api</artifactId>
-									<version>3.0</version>
-								</plugin>
-							</plugins>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[2.0,)</versionRange>
-										<goals>
-											<goal>copy-dependencies</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+                                </plugin>
+                                <plugin>
+                                    <groupId>org.jvnet.jaxb2_commons</groupId>
+                                    <artifactId>jaxb2-basics</artifactId>
+                                    <version>0.9.3</version>
+                                </plugin>
+                                <plugin>
+                                    <groupId>org.jvnet.jaxb2_commons</groupId>
+                                    <artifactId>jaxb2-fluent-api</artifactId>
+                                    <version>3.0</version>
+                                </plugin>
+                            </plugins>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-dependency-plugin</artifactId>
+                                        <versionRange>[2.0,)</versionRange>
+                                        <goals>
+                                            <goal>copy-dependencies</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 </project>
diff --git a/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java b/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java
index 09c4962..881a3fc 100644
--- a/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java
+++ b/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java
@@ -59,13 +59,17 @@ public static boolean validate(File document, File schema) {
 	 * @param transformation
 	 * @return
 	 */
-	public static File transform(File document, File transformation) {
+	public static File transform(File document, File transformation) throws IOException {
 		logger.info("Applying XSLT " + transformation.getName() + " to file "
 				+ document.getName() + "... ");
 		String orig_name = document.getPath();
+        
 		String transf_name = orig_name.substring(0, orig_name.lastIndexOf('.'))
 				+ "_transformed.xml";
-		File outputFile = new File(transf_name);
+        
+		File outputFile = File.createTempFile(transf_name, ".tmp");
+		outputFile.deleteOnExit();
+        
 		TransformerFactory factory = TransformerFactory.newInstance();
 		Source xslt = new StreamSource(transformation);
 		Transformer transformer;
diff --git a/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java b/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java
index fdcb4d7..f944aa7 100644
--- a/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java
+++ b/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java
@@ -20,6 +20,7 @@
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
+import java.io.IOException;
 
 /**
  * @author borismarin
@@ -55,7 +56,7 @@ public void validateSimulation() {
 	}
 
 	@Test
-	public void testCanonicalize() {
+	public void testCanonicalize() throws IOException {
 		File xslt = getLocalFile("/Schemas/canonical.xslt");
 		logger.info("Asserting that a noncanonical file fails to validate...");
 		assertFalse(XMLUtils.validate(nonCanonHindMarshRoseSimFile,