increase timeouts, fix travis tests