minor refactoring

Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
Merge branch 'master' of https://github.com/cscenter/Vindur
Tests fixed after merge

Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
Merge branch 'master' of https://github.com/cscenter/Vindur