Remove required option from some fields / Fix test errors