Cleaning up Field tests