MEDIUM / Fixing unit tests