Added feature tests
Merge pull request #3 from seanmack/feature_tests

Added feature tests