[BACKLOG-207] - Refactoring, unit tests
Merge pull request #3 from brosander/BACKLOG-207

[BACKLOG-207] - Refactoring, unit tests