Fix some tests. Use travis-ci 1.9.2