Merge pull request #1 from thecity/jasonh/add_some_tests

Jasonh/add some tests
Removing sensitive stuff....