TD-3958 fix unit tests