Improved test info includes.
Removed old module syntax. Removed obsolete testInfo module.