Readable comments, refactor test server