Added fake Datagenerator & cleaned up some code.

Signed-off-by: Hans W. Uhlig <hans.uhlig@teamaol.com>