Moved forms to partials, hopefully improved coverage