Added more tests and updated travis script.