Documentation is in. Clean up of test_helper and genral tidy-up