Fixing up the first lot of tests and trying to get travis ci working