more generators, etc.
improved tests
more fixes in unit tests