Update tests for new output