Arguments handling reworked.
Test suite extended.