Added in a test for bug #7591.  It now tests to see if the extraValues set restrictions work.