Test Fixes.

I was able to reproduce the same error as seen on Travis and this change-set is believed to fix that there as well as it did in my local environment.  (Considering the time of day this seems unlikely, but:) __DO NOT MERGE__ without a green-light from Travis. It's literally the point of this PR.