Updated Queue Structure - rerun tests