PDI-695 - Added Unit Tests