Test fixes
Merge pull request #431 from ovatsus/master

Test fixes