refs #8: got the last of the tests passing