This patch updates the stack to use @AfterClass for counting the tested atom types, rather than relying on the last method in the source code to be called last. This fixes the "regression" introduced by updating the JUnit stack which no longer keeps the test method order.
Two additional patches fixes two problems exposed by this fix:
is missing from the new interface, I'm going to go ahead and add this.
compiles and no new test fails, applied and pushed