Fix field ids for tests