Migrated to 2.8 and added Tests  #2366

Task ID: 2366

Review ID: 402001