Adapt base of unit tests to last changes