Added file forgotten in previous commit, plus one more test.