Added new tuple headers and updated tests to use a common test source file for each test.

[SVN r86715]