Removed OCVTest entirely in preparation for re-adding