Merge "Fix warnings in config-api tests"