Any comments on this series? Otherwise I will just merge it, as it only affects a testing tool (and one that is not currently being used by FATE - though as a side note, we should add it once all of the checks pass again)