Fix tests now that we have H1 capturing
Rejigger order that post_build stuff happens.