MINOR Tweaks to get Travis CI passing unit tests.