update tests
Merge pull request #28 from fna/master

Update tests