Re-enable tests affected by #1321840

Uncomments tests that were failing due to the above bug

Change-Id: I0945fd50fd00c53808412bbc6a837dc153abef25
Merge "Re-enable tests affected by #1321840"