@jaceklaskowski I think it's better to do such improvement in a separate PR which will involve lots of similar changes for all test suites. Please feel free to send a PR and I will help to review. Thanks! 