Removing Obops references from solution wo/tests