Updating waiter configs, fixing bug in waiters, and updating integ tests