Merge "include unit test for enhanced error handling" into rvc-dev