using same xml definition instance for performance;remove old test cases