JA: fixes in testing fields as per initial DIAC test plan