Updated MultiFileMap and Junit, added Storeable
Changed encoding to UTF-8