Merge pull request #20 from gretchiemoran/PRD-3965_Merge

PRD-3965 unified feature commit
PRD-3965 Fix for failing test