Edits to output, testing