Updates - comments and little change in test for assigning saved iapd.