fixed bugs that were breaking tests
Merge pull request #42 from kunovsky/more_fb_tests

fixed bugs that were breaking tests