Fixing NYI stretch goals >_>

copy-pasta is bad...
Adding basic unit tests around edge cases
Merge remote-tracking branch 'origin/master' into service
Changing function name to make sense
Merge pull request #9 from hackernight/service

Adding tests around service and new endpoints