Tidy up tests so patches are all in one place