Testsuite: fix 0173 + 2100+, take 2