Raman - Trying to fix flaky tests