Fix Ponos test See merge request !1091
mentioned in merge request !1092 (merged)
mentioned in merge request !1089 (merged)
mentioned in merge request !1070 (merged)
mentioned in merge request !1090 (merged)