Re-order test to fix timing issues
Update test output to match adjusted test
Merge pull request #434 from rneatherway/travis2

Travis test run robustness