Regression test fixes (WORK IN PROGRESS)

* Please DO NOT MERGE this pull requests yet.

Signed-off-by: Eirini Psallida <eirini.psallida@cern.ch>