Last fixes for selftest
Merge branch 'master' of https://github.com/toerb/multicastor