Minor test edits