Remove parts of tests which are handled by parents

Also remove stuff which is no longer needed
Change-Id: I36f5a3806f412901b468f0fec5ad74bdc6c475ed
Merge "Remove parts of tests which are handled by parents"