Attempting to change some things to pass on TravisCI...even though I'm not getting any unit test failures.