[2944] Unitest fixed. No more conflicts.