Introduce subtype filter to unit test

Change-Id: I3de573ffa38c46b78e1f8a602f99c49c164516f0
2 files changed