Add more ExpandIdTests.