Move test_tags to simple_layout

Change-Id: Ia5c2e8ea99523fa043f4e8b8aa0e15a4dc25200d
7 files changed