Renamed queue struct names, removed test code