Shored up some tests and documentation