Merge pull request #56 from rackspace/tech-debt-reduction

Simplify a few acceptance tests for illustration.