try to not remove spaces from indentation when uncommenting
fix tests