Fix JSHint-reported issue
Finish convert server tests