Javadoc.
Test fix.
Detangle some of the test infrastructure, and fix the standalone script spec.