Result format changed, update tests/code.