Fix block-img and more doc tests