added ending forms and tests