Tests adapted to new output