Added spec for finder with single ID.
Removed unused create adapter setting.
Clean up and add sanity checks.