Added some extra files to make unit tests consistent across OSX + Windows