MANTA-92 fix several test issues and update cl