am 6d254778: Merge "Seperate test list from activity so it can be reused."

* commit '6d254778d86822ce3ab799c5cfcc93ee3a8662aa':
  Seperate test list from activity so it can be reused.