test fixes
Merge pull request #70 from thomasalrin/master

test fixes