remove comment
fix tests but it is failing for some unknown reason