Fix for tests against PR-641