Address ISLANDORA-1045

I guess it really depends on how much we can mess with the test files without messing up the tests? Did you or @qadan write the tests?