Improving tests and trying to get everything to run on travis.