Updating tests, fixing bug with restarting consumers