Reenabling tests in OOP
am: f45509ec8e

Change-Id: Ibd38193e9b1c2bfd49564e8e9bf77af7286f1a88