Add basic generator and a test for it