components #5.11.x :  Cleaning the test code for Jenkins