B-60837: Added tests for new logic.