Fix integration tests

Fixes #591 

![screen shot 2014-08-04 at 1 46 17 pm](https://cloud.githubusercontent.com/assets/1656824/3803256/6866281c-1c18-11e4-89df-56f01cd1c0ca.png)