added unit tests
Merge pull request #1 from injektoxa/Feature/F001.AddUnitTests

added unit tests
Merge branch 'Feature/F001.AddUnitTests' into develop
Merge remote-tracking branch 'origin/master' into develop