REPORT-220: Added tests