fixed and added some logic to tests [PD-876]