make current tests pass
Merge pull request #11 from amesee/make-tests-pass

make current tests pass