Coverage for the hydrator generator
CS fixes, unused imports fixes