Change server port dynamically
Modified tests to run with the Heroku set-up