finished fixing all tests
Merge pull request #11 from peoplemerge/master

fixed tests