Added travis and updated tests