subtests: Fix tests errors

Fix problems in subtests.
daaaaaang, thought I fixed that one too, snap, where are all my commits going.  damn this bad memory :grinning: