fixed two tests
Merge pull request #102 from jdegoes/master

fixed two tests and one bug