Removes resolved TODO
Adds a check for settingkey in integration test

It only checks for the initial value, not if there is the value changes
later on.