Fix travis tests

This following commits should reanimate the tests on travis that failed since introducing x64-mingw32.