Lots of new code added to support the new IP/Award linking test scenario.