Use "expect" all the way down
Better test output on Travis