Refactor Tests
Merge branch 'master' of http://github.com/josepma/fofo