further additions to the <figure>-test