Parse entities, test at integration level, improve specs