MODE-2045: Fix for failed tests