MEDIUM / New unit tests + fixing many others