Make Travis pass, tests added