rename tests
missed a few test renames
convert some unnext calls to peeks
allow line breaks inside parenthetical expressions