Fix regression test

3 problems addressed:
priority/basic does not currently support some functionality
a test was assuming more than one node when submitting two jobs with the --exclusive optiion
a sleep was required so that completing jobs could be cleaned up before submitting a subsequent
  job with the --immediate option

testsuite/expect/inc21.21_tests

@@ -213,7 +213,7 @@ sleep 10"
 	set running 0
 	spawn $squeue -h -o "\%t \%r"
 	expect {
-		-re "PD.Assoc*" {
+		-re "PD." {
 			incr pending
 			exp_continue
 		}
@@ -440,6 +440,9 @@ proc inc21_21_grpwall { test_type limit } {
 	send_user "\n====== Test $test_type"
 	send_user "(Within: inc21.21_tests function: inc21_21_grpwall) ======\n"
 
+	# Wait for old jobs to clean up
+	sleep 2
+
 	# Since wall is a decayed variable lets reset it to make sure the test
 	# gets exactly what we would expect.
 	reset_qos_usage "" $test_qos

testsuite/expect/test21.21

@@ -83,6 +83,11 @@ array set acct_mod_assoc_test_vals {
 
 print_header    $test_id
 
+if { [string compare [priority_type] multifactor] } {
+	send_user "\nWARNING: test only compatible with priority/multifactor plugin\n"
+	exit $exit_code
+}
+
 # Determine what the selecttype param is
 if {[test_select_type_params "CR_CORE"]} {
 	set selectparam 1