significant improvements... priority-change test now passes correctly