REPORT-567, add unit tests