Update Travis
Update tests