v1.1.0 Refactoring for Unit testing

Although the tests where available automatic testing was not available. Project got refactored to provide that.
There should not be any a break with the functionality.