Reorganize tests (preparing to test snapshots with files)