Changes to "fix" Travis-CI unit tests