Some new unit tests
Generator and new tests