Fix testsuite, closes #4174