Refs #252: Add tests, a little more doc