Test fixes for mono
Merge pull request #486 from ovatsus/master

Test fixes for mono