Fixed tests broken after implementing user-friendly labels.
Added @FormId to mark id field of a data entity. Implemented writing the
id to form-data.