Cosmetic
Added port to URL
Migrated to httpretty
Small improvements
Adding new test to be run on circleci