This completes the remaining todo from D5520.
Note that i tried to extract the following into a fixture factory [1] but somehow that
hangs. So my stance here is to let this as is as i've spent way too much time on trying
to debugging this test issue.
Related to T3084
[1] P1006