subtests: Fix tests errors

Fix problems in subtests.
Ahh okay, a bit of overlap, I can rebase before apply and these should all go away.