Raman - Last try to fix flaky tests