Simplified a test by using FUTURE_DISPATCH.
Fix for some style issues.

Review: https://reviews.apache.org/r/24773
Removing unnecessary argument (same as default).