Knock this into slightly better shape and bring over some more tests from the old test suite.
Attach a file by drag & drop or click to upload
