Added travis and fixed tests