Bump Travis settings
Fix up tests