Fix java6 compiling on my computer
Add delegation TestHelper and use it at all possible applicable positions