Comment form

Added tests and changed edit form