added some data genaring logic and unit tests
deleted obsolete file