Added travis and improved tests