Adding travis and fixing tests