Test refactor

![alt](http://media.giphy.com/media/iRI5a9An1RuHm/giphy.gif)