Cleaned up test cleanup for FileBackend and avoid use of @.

Change-Id: Ie9f0090f626384a90b0139b9f8c2d94bf0bb8f23