Change test dir
Initial version of generator refactoring