Task 54279: Backport new style tests to 3.6.1

Checked out tests/ at f01bb64 and adding back to 3.6.1
Merge pull request #1 from stacic/backportTests

Task 54279: Backport new style tests to 3.6.1