Add productRetest flag,

Also updated some TODOs