convereted to data-driven tests
Merge pull request #1086 from sghai/data-driven

Converted arch tests to data-driven