Cleanup/test edits.