fix comments
fix comments and fix tests