Test refactoring

![schermata del 2014-07-19 16 22 32](https://cloud.githubusercontent.com/assets/5896864/3634888/42ca2010-0f50-11e4-8477-7088277332ee.png)