More Harmony test consolidation.

Change-Id: I98070d03c8b5f5764d54e3d2058c5707bbb954ce
5 files changed