Minor fixes; restructured main.py; tried to include generators into tests -> failed miserably