Updates to shim response to ensure no null shimKeys are returned in responses. Updated unit tests to check for shimKeys in shim responses.