subtests: Fix tests errors

Fix problems in subtests.
I agree but there should be another patch witch repair this problem.