Merge "Fixed exceptions during test tearDown" into oc-dev