fixed some broken occ internals from last change, fixed broken test