[TASK] Adjust unit tests to last commit