Cleanup and formatting per @fpotter
Addresses Issue #17: 'begin-test & end-test events should include test class & method names.'