Add working generator
tests