User should have control on data cleanup event. Currently it's always executed after the test. Provide @Cleanup annotation with following options:

• DISABLED
• BEFORE (default)
• AFTER

This annotation can be placed on class level - defining the default behaviour for all test cases, but when define on method level it will override global settings.