Split form into partials, added controller test