Fixing some tests and trying to diagnose travis failure.