Added tests.
Removed unused generators