subtests: Fix tests errors

Fix problems in subtests.
yes sorry this is from historical reason when the patch was created...