Fix logging to be more useful in the ftests