generate: fix for heavside unittest
unit tests: add some, clean some...