Further updates to test suite

Changes to get Travis-CI passing.