Added a couple more tests and updated travis