MEDIUM / Try to fix production issue with unit tests