MEDIUM / Fixed unit tests