Brad's changes to Test Plan and ICD