cleanup and adding additional tests
Refactoring
Merge pull request #33 from glennblock/BuildingTheApi

Refactoring config, moving around retrieval tests and adding new.