subtests: Fix tests errors

Fix problems in subtests.
Ahh, hmm, okay, I thought I remembered fixing that one in containers, oh well. no worries.