This will be my first ERT test, so, does the following (attached, because Gmail) patch look acceptable? And, it is possible to commit a file with trailing whitespace? ​