JAL-2588 Added tests