CORE-5314: Added unit test to protect against regression