Merge. Fix for Unittests.