[OTF:1619] Updated relevant tests