Improve test failure message for #1390.

DO NOT MERGE YET -

Just trying ot diagnose the issue on travis (cc @eed3si9n )