Trying to fix travis build and testing