Milestone MeasurementSys: S2.a Improve test suite for I2 or NLR deployment

Improve test suite for tests needed for I2 or NLR deployment. I2 deployment is preferred but is contingent on getting permission from I2.

Status: Milestone not complete as of 8 June 2011. Work deemed to be non-critical.