Rolled back some test changes.  Link fields are also no longer marked required, since we currently have no mechanism to prevent the user from leaving them blank.