Unit test fix after id variable corrections

I merged the upgrade branch too quickly after this commit and it got missed. Doing another pull request just to be compulsive about it.