Merge "[BUGFIX] Adjust unit tests to changes"