Update travis script
Update tests