Standardize test cases to follow a pattern when they can.
Merge pull request #1 from jamie-stackhouse/standard-tests

Standardize test cases to follow a pattern when they can.