Merged PriorityTest Changes into Master

manual merge of changes into master