Checked in now, in the locations you suggested! The only change I did was to "not print" the source to standard output when testing, so the whole test suite output stays readable. Well done and thanks, Andy