TROIA-133 runtime errors fixed.
Comment explanation.
TROIA-133 cleaned data generator test.