Danger commit. It works ... but it's horrible. 

Must. Try. Harder... to commit in smaller chunks.

TODO: Remove magic numbers from TestActivity.
TODO: Refactor TestActivity.