Remove OCTest because deprecated
Merge master