Unit test fix after id variable corrections