Fix up testing and Travis.