Merged tests back together.

See title.
Merge pull request #24 from Orasi/Brian_Branch

Merged tests back together.