FAIMS-726 Add automated tests and fix form labelling