subtests: Fix tests errors

Fix problems in subtests.