Fixed some test issues
Merge branch 'master' of https://github.com/avaranovich/megal