Minor tweaks for integrationt est coverage