Reenabling tests in OOP am: f45509ec8e
am: bc699904d9

Change-Id: I2db244a86b6a746f24883bbd4b0f14496e605009