Tests merge

ITS WORKING!!!
![pope-francis-loves-you](https://f.cloud.github.com/assets/4682033/1660212/db71749c-5bb6-11e3-936d-f7b2be926455.gif)