Merge "Add API tests for FileStore."