fixes #6445 - fixing tests.