Merge pull request #87 from dinder-mufflin/Josh

Added a few unit tests.