tests: update to use make-q* instead of manually mutating a queue