test fixes
Merge pull request #46 from komarov/master

small test fixes