Unit tests around invalid ids
Resolved merge conflict