Revert "Disable failing tests as cause is investigated"

This reverts commit 339e632d.

Reason for revert: test was failing due to branch being out of sync rather than legitimate bug

Change-Id: Ia4cd320f51b5b20ad0d7de5306eaa759274e267a