OC-5913 Activate OC unit tests

Cherry picked @jkeremian's commits