assert messages refactor for issue #3415 on master branch
unit test update for issue #3415 on master branch