Added tests for [Delivers #82658822]