Fix a lint error
Use another port number in test
Apply template layout