Remove useless comments and fix tests