refactor, add tests
Merge branch 'master' of github.com:Teleinformatyka/RedSparrow