Test re-factoring

Change-Id: I24484ef22a8cc9bb86fb64adebb7e577e0bd83be
Merge "add failing test"
Merge "add flakiness to our artificial test"