Merge pull request #29 from davegw/bug-fix

Remove broken test
Fix bug by setting server location back to localhost