Added tests [PD-623]