add Custom fields if present, and move Test field to correct location