massive test cleanup and JUnit4 helpers for class annotation support