add basic testing to generator
Fix conflicts