Add more tests, update travis.yml