redid all forms for simple form, refactored tests :snake: