Unit Tests
Merge pull request #23 from inaka/tom.sep1.unitTests

Unit Tests