Travis CI - more WG refactoring