GPS test: better queue handling