Fix tests to check config from base `rest.wrap`
Fix allowing config passed in to `rest.wrap`
Merge pull request #3343 from Nemo157/rest-wrap-fi

Rest wrap fixes