CON-1988 add unit tests