subtests: Fix tests errors

Fix problems in subtests.
This smells a bit funny, are you sure it's suppose to remove if the list **is** empty? (I did not view complete file)