Added unit test case for REPORT-535