Fixed auto generating IDs for mock data

Change-Id: Ibeaad4a16d1be49f0a6de1bcff8ead9af356b342