Updated test cases, changed queue management