Fixed tests to work in travis hopefully for last time :)