Revert^2 "Try to ensure tests run sequentially"

c0dd229fc6afb78c18b6688f7b5034f6229b222d

Change-Id: I1d9366f0cbe4fb41cedfed987162ec15e7845530
29 files changed