Fixed some tests, updated settings to work easier with travis.