Update fixtures, Test to use Fields with types