Regression test fixes

Signed-off-by: Eirini Psallida <eirini.psallida@cern.ch>