Updating to change in constants; fixing a couple of tests
Merge pull request #110 from alxdarksage/develop

Fixing tests (updating to API changes, fix bad merge)