Create test files in the correct place.
Merge pull request #496 from ycombinator/fix-smoke-test

Create test files in the correct place.
Merge pull request #497 from rackspace/working

Merging working -> master in preparation for patch release