Update tests so they can be run in travis