testsuite: *really* fixed tests for a03fde3ea32d3eb2cadb443454749111dda1797f