Enable without option when fetch from remote.
Add extras in tests.
Enable without option when fetch from local