close comments
fix tests