Test Fixes.

This appears to allow Travis tests to pass.  __DO NOT MERGE__ until that is demonstrably true.

cc: @moollaza @jagtalon