Better test output

@alexcrichton r?