am 5e481383: (-s ours) am 6d254778: Merge "Seperate test list from activity so it can be reused."

* commit '5e48138351ee63cb5b8b2fe7e8205af80d55b194':
  Seperate test list from activity so it can be reused.