changed priorities, fixed tests