Clean up and
removed hardcoded ports from EndToEndSpec as is does not seem to make a difference.