Fix for travis build error.
More test suite updates.