Bit sloppy, but tests now running on Travis