Fixing tests + reconstructing external files