Company form - edits, tests