Fix docblocks
Eliminate unused arguments
Refactor how methods annotated with @beforeClass or @afterClass are invoked