fixed some bugs
added folder with generator and tests