This probably requires adapting the unit-tests.