GitHub #17 - Fix spacing and captilization
GitHub #12 - Fix test needing mock transport