Extracting a dedicated package for fields
Fixing a test and a bug *at the same time*