PL-154: added id parameter, extended tests.