SYNR-387;SYNR-549;PLFM-1793;SWC-830
SYNR-387;SYNR-549;PLFM-1793;SWC-830
SYN-830 added unit tests
Merge pull request #563 from brucehoff/develop

SWC-387;SWC-549;PLFM-1793;SWC-830