subtests: Fix tests errors

Fix problems in subtests.
No its wrong. oh dear.. I love rebasing of rebasing...