SYN-830 added unit tests