Consolidates tests into one file.
Merge pull request #42 from cs27x/group2/pull_request/jake_bray

Consolidates tests into one file.