Adding travis and simplifying tests