Stripped out additionalKeys arg in unit tests