Update tests

I'm getting the tests set up to use with Travis CI