OSTF-1334: fixes after test execution on the labs