Small improvements for invoice form and form tests