fix-failed-unit-tests