<issue_start><issue_comment>Title: Refactor and improve delivery tests
username_0: Currently, even though tests cover pretty much all features, they can be quite inconsistent and the code quality can be improved as well. It might be worth going through the tests, finding the patterns and recreating some of them (i.e. rich text tests, live tests, field tests..)<issue_closed>