- forward port some changes to tests from gtzelepis/master [ci skip]
[ci skip]