Update tests to match `file` field shift
Delete unused test files
Clean-up