Fix old unit-tests