Improve merge request time spent in testing by fixing unstable unit tests

Uncategorized