Several tests had to be patched. The new ouput is bad in several cases. Future commits will fix that.