Adjust logic and remove panics from functional tests.
Attach a file by drag & drop or click to upload
