CDITCK-457 next portion of updated tests