Merge "OLM unit testing update"