Convert logic for ops approach.
Depends on D7931
Tests
now logic is based on ids - so modifying the test to use different ids for different objects
rebase