Changes for #390 Broken TestNG several tests report

This should fix problem #390 
sorry I already committed changes after code review. Do you want me to add it and commit it again?