More tests
Better arguments handling