Merge "Revert "Add API tests for FileStore.""