More tests

Possibly minor, but I'd at least ensure the id follows the usual pattern of index/itemtype/id, since some bits of the code rely on it having that sort of structure (and at some point ideally we'll split it into dedicated columns anyway).