Improved testing. Finalized in-app tracking of existing files.