Making large tests a LOT faster

Refactoring monolithic test setUp into smaller chunks
Yay, ready for review

Change-Id: I85edf4c22b827f5e14087a5287eed553efb11620
Lint cleanup

Change-Id: If31cae6b051cdd8559aed5b71fb15e2dcc6f322e
resolve merge conflict

Change-Id: I26bdf675c3ea787c6d6f90e549c6ea5711b14bc1