Revert "Remove parts of tests which are handled by parents"

This reverts commit ef1d9c2e31da0c80ad592dd0f25167b9ccd6e119.

Change-Id: I07259aea9df9db1d1b43a4a3ed9f7130218b9314