Added error code 002-2505 and its verified logic.
Added tests for error code 002-2504 and 002-2505
Fixed bug