Prep for unit tests: Specify API in methods that require it, default to the singleton
Merge pull request #28 from techwiz24/unit-tests

Prep for unit tests: Specify API in methods that require it, default to the singleton