Minor  changes related to tests
Merge branch 'master' of https://github.com/cscenter/Vindur