improved tests part
Better parameters handling