fix feature tests to pass
Merge branch 'master' into testing
Merge pull request #53 from ChaeOkay/testing

Testing