Merge "Refactor OLM Junit tests"