Fixed mystery output. Also added missing file tests.