[BACKLOG-207] - Refactoring and adding unit tests
Merge pull request #2 from brosander/BACKLOG-207

[BACKLOG-207] - Refactoring and adding unit tests