Refactored API
Refactored Tests
Merge pull request #101 from mtaylor/refactor_work

Refactor tests and api files