Annotation form tx

Adds test to #3306