Drop use of "filter" in test layouts

Change-Id: Iec6e3be64c5d838a6f1cc5c37fd64c4abfdab8ea
2 files changed