Fix privacy tests with new advanced form stuff