Moved commented code into functions of its own. This will repeatedly done as I
visit other test-* files