Updated Config/TR1 tests so they include the needed headers. Added new TR1 tests to catch some cyclic dependency errors.