Knock this into slightly better shape and bring over some more tests
from the old test suite.