Fix unit-tests according to changes in release 3.6.5