try to migrate to oc7
more changes for 7
More fixes
fix unit tests