Tweaking test output comparisons for Travis.  Adding mysql driver test back in.