Fixed tests after security edits