BUG-4300: adjust unit tests