[fix] Remove comments, fix tests