Improve the travis matrix
Fix tests on 1.7+