fix failing test
refine logic that adds @Test annotation automatically
Merge branch '2.1.x' into 2.2.x