Added tests.
Removed unused generators
Merge branch '3.0.x'