Revert "Temporarily remove tests added in I8eef5a165"

this was to be temporary, right? we need the tests in.

If there are issues with jenkins, this is not the *best*
way to fix them.

This reverts commit 44a19685317de16f5afe42b710d8d412352d7fe9.

Change-Id: I5dd60a9818c28155d96a6642c588781667e682c3
Merge "Revert "Temporarily remove tests added in I8eef5a165""