Change program generating test data

Hi,
I've prepaired a patch with my changes and squashed those with changes that Jarrko requested under Your pull request here: https://github.com/smack-team/smack/pull/95.

Maybe it would be better to have stylecheck corrections on separate patch, but to do it right it would require refactoring Your code first (also those lines that I had changed before), and rebasing my changes on it. This would make too much effort I think.
Would that be acceptable to do it that way: in one commit, how do you think?

Best regards,
Jan Cybulski