fix Gateway Support test.
fix docblocks
fix whitespaces
fix server port
Merge branch 'develop'