ARQ-863 Improved log message and added test cases