Add TDH test
Add a simpler generation interface