fixing tests #1600

Job	Run time
unit_tests (latest, 7.2, singlesite)	13m 8s
e2e_tests (latest, 7.2)	14m 18s
unit_tests (latest, 7.2, multisite)	12m 22s
e2e_tests (latest, 8.1)	12m 51s
checkstyle	22s
unit_tests (latest, 8.1, singlesite)	13m 15s
unit_tests (latest, 8.1, multisite)	14m 20s
e2e_tests (trunk, 7.2)	13m 55s
unit_tests (5.2, 7.2, singlesite)	12m 48s
e2e_tests (trunk, 8.1)	12m 52s
unit_tests (5.2, 7.2, multisite)	13m 7s
	2h 13m 18s

Provide feedback