test fixes
Merge pull request #18 from yads/master

test fixes