Clean up field mapping tests