Finish unit test
Merge branch 'master' of https://github.com/fbarrios/tdd-2c2013-grupo3