testsuite fixes (#359) #425

Job	Run time
Coding Standard & Static Analysis	24s
testsuite (8.2)	1m 32s
testsuite (8.1)	1m 11s
testsuite (8.3)	1m 12s
testsuite (8.4)	56s
testsuite (8.1, prefer-lowest)	1m 16s
	6m 31s

Provide feedback